Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add user status #1668

Merged
merged 56 commits into from
Feb 25, 2022
Merged

add user status #1668

merged 56 commits into from
Feb 25, 2022

Conversation

mahibi
Copy link
Collaborator

@mahibi mahibi commented Nov 4, 2021 •
edited
Loading

resolve #898

conversation list conversation list (night) choose account dialog
grafik grafik grafik
set status dialog conversation info autocomplete mention
grafik grafik grafik

Signed-off-by: Marcel Hibbe [email protected]

@mahibi mahibi marked this pull request as draft November 4, 2021 13:45
@timkrueger timkrueger self-assigned this Nov 10, 2021
@timkrueger timkrueger added the 2. developing Work in progress label Nov 10, 2021
@timkrueger timkrueger force-pushed the feature/898/userStatus branch 2 times, most recently from cf746ca to b4ce31c Compare November 17, 2021 09:31
@timkrueger timkrueger force-pushed the feature/898/userStatus branch from b4ce31c to dd2a832 Compare December 28, 2021 14:11
@timkrueger timkrueger force-pushed the feature/898/userStatus branch from 2d4018d to b434278 Compare January 12, 2022 17:06
@timkrueger
Copy link
Contributor

Added first Kotlin data class instead of using a Java class with the annotation @Parcel for a JSON model class. Both solutions work in parallel. So issue #1548 can be solved step by step.

@mahibi mahibi force-pushed the feature/898/userStatus branch from b434278 to d37a273 Compare February 2, 2022 14:10
@mahibi mahibi force-pushed the feature/898/userStatus branch from e4e3708 to 04f3ae8 Compare February 3, 2022 15:59
@mahibi mahibi assigned mahibi and unassigned timkrueger Feb 3, 2022
@mahibi mahibi force-pushed the feature/898/userStatus branch 2 times, most recently from 7a47754 to 1afb344 Compare February 8, 2022 11:51
@mahibi
Copy link
Collaborator Author

mahibi commented Feb 8, 2022

There is a problem with the lib https://github.com/vanniktech/Emoji
With version 0.8.0 the emoji selection screen is too big, see issue vanniktech/Emoji#474
that's why @AndyScherzinger once commented to keep version at 0.6.0

A solution to fix it, is setting
android: windowsSoftInputMode="adjustResize"
in AndroidManifest.xml, which i plan to do anyway to finally(!!) fix issue
#1285
This issue in turn will require some more work, see
#1285 (comment)

So:
Either keep version 0.6.0 of https://github.com/vanniktech/Emoji, (but it is from Feb 2019 and it would require to rollback changes from @timkrueger ) or solve issue #1285 while getting rid of a 3rd party lib, bump https://github.com/vanniktech/Emoji and continue the "add user status"-issue in a clean way without old libs or workarounds.

That's why i suggest to solve issue #1285 first before continuing this "add user status"-issue. FYI @nickvergessen

@nickvergessen
Copy link
Member

Fine by me

@mahibi mahibi force-pushed the feature/898/userStatus branch 2 times, most recently from 19c9ac4 to bbd8cda Compare February 16, 2022 14:04
@tobiasKaminsky tobiasKaminsky requested review from tobiasKaminsky and removed request for tobiasKaminsky February 17, 2022 07:00
@mahibi mahibi force-pushed the feature/898/userStatus branch 7 times, most recently from 8819ce1 to 5921442 Compare February 23, 2022 12:24
mahibi and others added 11 commits February 25, 2022 12:11
@mahibi
align username etc vertical if no status message is set
305ceed 
Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi
fix textcolor for highlighted online status button
b7b92eb 
Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi
set same textSize for all headings in Status dialog
f475065 
Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi
avoid linebreaks for "clear at" calculation
4984ba4 
because:
- can lead to wrong calculations!

- avoid klint complaining about indentation

Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi
align icons + text in choose account dialog
e1c706f 
Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi
add rounded colors to online status buttons
ec438b0 
Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi
fix vertical alignment for MentionAutocompleteItem's
d4f9f99 
Signed-off-by: Marcel Hibbe <[email protected]>
@AndyScherzinger @mahibi
migrate FlexibleItems to native view bindings
0677607 
Signed-off-by: Andy Scherzinger <[email protected]>
@AndyScherzinger @mahibi
adapt license header to app
7ce1b9e 
Signed-off-by: Andy Scherzinger <[email protected]>
@mahibi
Drone: update Lint results to reflect reduced error/warning count [sk…
d3c46e7 
…ip ci]

Signed-off-by: drone <[email protected]>
@mahibi
fix NPE if status is null
0dc42a1 
Signed-off-by: Marcel Hibbe <[email protected]>
@mahibi mahibi force-pushed the feature/898/userStatus branch from f58d888 to 0dc42a1 Compare February 25, 2022 11:12
@mahibi mahibi mentioned this pull request Feb 25, 2022
Closed
@mahibi mahibi added this to the 13.1.0 milestone Feb 25, 2022
@mahibi mahibi added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Feb 25, 2022
@github-actions
Copy link
Contributor

APK file: https://www.kaminsky.me/nc-dev/android-artifacts/1668-talk.apk

qrcode

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app.

@mahibi mahibi mentioned this pull request Feb 25, 2022
Closed
@nextcloud-android-bot
Copy link
Collaborator

Lint

TypemasterPR
Warnings208205
Errors11

SpotBugs (new)

Warning Type Number
Bad practice Warnings 11
Correctness Warnings 111
Experimental Warnings 2
Internationalization Warnings 9
Malicious code vulnerability Warnings 141
Performance Warnings 27
Security Warnings 3
Dodgy code Warnings 188
Total 492

SpotBugs (master)

Warning Type Number
Bad practice Warnings 11
Correctness Warnings 112
Experimental Warnings 2
Internationalization Warnings 9
Malicious code vulnerability Warnings 141
Performance Warnings 28
Security Warnings 3
Dodgy code Warnings 191
Total 497

@mahibi mahibi merged commit 2ccbbc5 into master Feb 25, 2022
@delete-merged-branch delete-merged-branch bot deleted the feature/898/userStatus branch February 25, 2022 12:09
@mahibi
Copy link
Collaborator Author

mahibi commented Feb 25, 2022 •
edited
Loading

thanks to @AndyScherzinger @timkrueger @tobiasKaminsky for your help 👍

@AlvaroBrey AlvaroBrey mentioned this pull request Mar 1, 2022
Open
@mahibi mahibi mentioned this pull request Apr 9, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tobiasKaminsky tobiasKaminsky tobiasKaminsky left review comments

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@timkrueger timkrueger timkrueger approved these changes

@nickvergessen nickvergessen Awaiting requested review from nickvergessen

@jancborchardt jancborchardt Awaiting requested review from jancborchardt

Assignees

@mahibi mahibi

Labels
3. to review Waiting for reviews
Projects
💬 Talk team
Archived in project
Milestone
14.0.0
Development

Successfully merging this pull request may close these issues.

User status next to avatar + change user status
7 participants
@mahibi @timkrueger @nickvergessen @jancborchardt @AndyScherzinger @nextcloud-android-bot @tobiasKaminsky